Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Mon, 16 Nov 2015 13:35:38 +0000 (08:35 -0500)
committerTom Rini <[email protected]>
Mon, 16 Nov 2015 13:35:38 +0000 (08:35 -0500)

Trivial merge